Fix for  _query parsed in some instances