Fixes #5917 - Content search ambiguous SQL id error
Merge pull request #4152 from parthaa/sql-fix

Fixes #5917 - Content search ambiguous SQL id error