Categorized by year of study. Added query support and filters, cleaned up the code.