search system upgraded, multiple terms search
Merge branch 'julien'