Please merge Fix/routes normalization

@anero