Search - error propagation first fixes
Merge remote-tracking branch 'origin/master'