Implemented infinite pagination until we don't have any results. Fixed field mappings
Code cleanup