Fix pagination in API results. Performance fixes on data fetch.
Merge pull request #1 from johngian/fix-performance

Fix pagination in API results. Performance fixes on data fetch.