cleaned up form so additional filter criteria are mutually exclusive