Aleksxor/4353 improve history