Filter button handling fixed
