fixed broken student queries
minor changes pre-branch