Re-introduce `change_query_filters`

Fix `change_query_types`