Changes to enrol query