Add & fix SQL tracing

- #3147
I see - consider adding a comment then to prevent from changing it.