Update queries to new FILTER syntax.