Fixed route matching
new TODO for rewriting route matching