Added filter and toggle click