Better HandleQuery system.