Fixes in the DB load and get to json