More work on default route without one set