Corrections to incorrect tag replacements

Re. #21