Update routes to add some consistency.

Signed-off-by: crynobone <crynobone@gmail.com>
Fixes broken code

Signed-off-by: crynobone <crynobone@gmail.com>
Add legacy route to match 2.0 code.

Signed-off-by: crynobone <crynobone@gmail.com>
Remove redundant code.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1'

Signed-off-by: crynobone <crynobone@gmail.com>