Search: Updated the add tags code on dev-branch from 6.6.3.a1 branch.
Merge pull request #2204 from VinRudramurthy/dev-branch

Search: Updated the add tags code on dev-branch from 6.6.3.a1 branch.