Changes to fix issues with history server UI