Server doc and view bugfix