Revert translation of tags; remove trailing whitespaces