FilterControl generalized and added to main project