bugfix & refactor historic manager