Added Filter funtionality