Fixed issue with remaining references to "prequeries"