Preserve object type when filtering attributes
Check actual values and not only presence off them