Fixed ugly code for confirmation message fix and applied it to all operations