changed some fields to reffer to taxonomy terms to base the filtering