* Fix: freezing for a while on update history (#81)
more refactorings