* Correctly handle List and history in server