Better Method of Decoding URLs

Change-Id: Ic0ea8ec8a9be442623d2cd5fca1df915187c6054