added additional attributes to click-popup
added additional features to JSON output for click-popup