Fixes to routing for hash fallback