Change data-set-* to data-jq-* and fix formatting