improve block selection to diffs & fix white spaces on the highlighted parts