Fixed/Added active filter for Users and Units