improve json match file structure