fixing the menu in this pull request.
moving db-call to the server entity.