#2197: Rearranged filter form