Temporary fix to reported issue 2
Temporary fix to reported issue 2, handling of space encoding as %20 added
URI template matching pushed to level 3