Search: updated the code from 6.6.3.a1 to dev-branch. Code related to ta...

...gs at search.