BS-164, improve log context