Make search be able to cope with multiple words separated by space(s).

Try to fix the TODO.