Added filter controls (which are currently not operational)
Rolled back to old sorting (for grading, hopefully :) )