Added filter by taxonomy
Merge branch 'filter_by_taxonomy'