Feature/logging query changes 84