Filter functionality added