More changes in router and dialog to better support Q.