Update to Enrollment query 

cosmetic changes - modifying aliases