catch up to upstream but maintain support for skiping html rows