refactored entitycontroller in the webservices a bit