Fixing Double Content-Filtering

- Removed unnecessary extra content filter from the backward route of
Router2
- Changed order of XML to be slightly nicer
- Renamed content-filter-update to be shorter and use the same naming
convention