use of super inside a callback gets a little hairy
fix navigation with query