Rename mCurQuery to mQuery for consistency