various  fixes and improvements in service editing