#1 - Adding option to choose result between html or json