[URIGen] Removed Switch, Causing Bug