4ID based routers now boot up
Fixed problems in other apps caused by moving around instrumentation in click