service edit and creation fixes