EHO-369 added department & user filter