Added options to remove search fields