url resolver updates
Added path siphon substitutions with directives
Added path siphon substitutions with directives