Changed json response structure and strategy for searching