More work on filter apply button