nickl- Fix #121 improve catch all route order