router: improve RFC7084 compliancy