#5537 - Fix bulk edit overlap, bulkedit improvements