Change routes order to avoid false matching