Bug Fix

- Bug Fix: Wrong URL generated by replace, see code comment for details
- Bug Fix: URL not updated for error message as replacement was not saved