bug fixes in edit service