New Queries are now handled properly.