improved handling of different log types