Improve branch filtering and raise error on empty dataframes (#162)

Improve branch filtering and raise error on empty dataframes (#162) #380