Filter button handling fixed