Added more options to the filter