Query filters now fully working