fixing default routing
Merge branch 'master' into web

* master:
  fixing default routing