Added more filters refactored the code for more major improvements