Removed some query types