return current and diff as dicts not json strings