(cleanup) changed utility query names