fixes 2, replaced "raw" :uri call with path-info utility