#137 work with filter buttons