Make filter icon work even better