[-] WS: Fix entities retrieve for some cases