TIKA-1208 : Check if mark supported and buffer as necessary

Still doesn't actually fix tests but has to be an improvement.