Added searching-filtering functional