Added filter type control.