Corrected historyClient view

+ minor bug fixes