Fix #534 - route definition ordering, first wins

Sorry for the initial PR in the wrong branch...

This fixes #534 by taking route order into account, as the recently relaxed matching for model routes was winning.