DS-432: added user and type filters