Added Department filters
Merge branch 'feature/165'