- fix order of entries when the new yaml file is created
- fix group in case there are no hosts in it