Added several fixes to make it work with the new JsonRest stores. Ready to get old code out of the codebase