[Do not merge] Fix routing clashes when id matches new or edit