Fix/route selection logic

Fixes http://jira.i2cat.net:8080/browse/OPENNAAS-1358