Improve excess row handling in new batch window