Added filtering for Subject (as a part of discipline)
Added necessary comments