Merge pull request #5255 from nabinhait/hotfix1

[fix] Fixed ambiguous column name in query