small fixes

...rray, fixed router to work with optional items