no more esr10 in query_creator