added or_port and dir_port query options for routers
cleanup before merge