Fixing issue 12 by combining database json sections