Filter out empty entries and also correctly deal with multiple facets in the query string filter