Fixing asset history functionality which was breaking in some conditions