search on!
json object fix
new logic