Added json address search to support #19