Simpifilied filter expanded/collapsed logic
Removed Filter#equals as now the expanded state is not in them anymore