Added field filters to Query