Update extractKVP(..) function to work with non-encodeURIComponent value