Minor fixes.
Merge branch 'adv-search' into merge