Fix get_filter_query