Some fixes in services feature