Fixes bug 849897 - Fixed backward compatibility in search modes.

@rhelmer r?