Changes to routing for wildcard and fix for py3