Added remove button and search filters