Enhancement/21/stop query



<!---
@huboard:{"order":43.75}
-->