Added Filtering for Discipline in addition to Elective Hierarchy