Fix some issue with tooltip and popover data-attributes