SLING-5507 - Collect more details around query execution Simplify the logic for determining the caller