merge docstore functionality into web server