minor
Added json reading in regular searching of data. Bunch of changes where needed