Data api fixes.
Merge branch 'master' of https://github.com/krablak/global.hackathon