Fixed bug writing json to file
Add layout 2 for match item