#106, #105, #104 Fixed so DataRepo works with maps/json