fixes for query subscribtion