filter and discard buttons flow fixed