Fix and improve WS

- entities list instead of entity id
- improve getHostsLoation