Updated with zooming and json search