bug/98/Realease-0.3.0-stop-query-bugfix