Fixed it so these queries now rudimentrally work