Added BuildYqlQuery