[CLC-1495] Documentation/justification for atomic level query wrapping, cleanup of excessive wrapping