Moved uri encoder back to parser.