Merge branch 'hotfix/85'
[#85] More rewrite fixes

- Old manual rewrite was a straight regex -- but that regex could match
  "current" as the language. Updated to fix this.
- Also, old manual rewrite did not include a "/" after language!
Merge branch 'hotfix/85' into develop