Fixed routing issues, added vertex-only resolve options.