changed query name, added TODO