Added the filter feature