fix router and clean up syntax for application adapator