#514 - Multiple Edit, Single Edit & Show revised