[AESH-171]
further changes
[AESH-172]
fixed history display bug