Improve branch filtering and raise error on empty dataframes

Improve branch filtering and raise error on empty dataframes #378