data-id and body  swipe fixes