Added fixes and support for student queries