Uri Template Parser

review fixes