Fixes #3122: 'column reference id is ambiguous' no longer appears on dashboard and report screens
(cherry picked from commit 83b2874539b2b5469586a23b1edacbdf2a88d2ef)
Fixes #3122: 'column reference id is ambiguous' no longer appears on dashboard and report screens
(cherry picked from commit 83b2874539b2b5469586a23b1edacbdf2a88d2ef)