Fix filter button area
Add a new key to select a new form id