Removed unnessary case for mapping url.Values