Refactor API  '/locations' WS