Queries updated to use all terms in Spanish

And also to use IN instead of multiple ORs in the FILTER expression