Fix lookupOption order
update lookupOption order to have route options on top

fixes #957
Merge branch 'devel' into pr/958