Enhancement/21/stop query