Bug fixes for Add/Edit/Delete actions