fix activeQuery after a query is deleted
folder interaction polish