Search - improvements - can now search even list
Merge remote-tracking branch 'origin/master'