Update filters form to new logic