BK-1227 Save with comment saves multiple entries