Added json files, removed resultset close