Fix URL parser to handle empty TV values. Also satisfy #22