Fix trait filters

Fix search issues - adding multiple trait filters and incorrect OR of categorical traits