change this over to using the query option because it seems we just turn it into one anyways