Merge remote-tracking branch 'origin/feature/tags' into feature/tags
* Code cleanup
* Don't show empty facet bar on tag search