EHO-365 EVU-1 Customers/projects and departments/users criteria are updated at the same time
removed some of the implicit java/scala conversions