Filter button fixes