Change how tags are removed and add search rerun