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