#6255 fixed row and header filtering to better handle subheaders, and to exclude html