[Update] Add additional infos on click