Bug fix and parse logic improvement

Affilate id, update logic. Improved parse logic to capture more types
of data.