Replace VALUES with FILTERS to speed up some queries