IN-482 - Fix remove_tag regex to support multi-word tags