Search - error propagation first fixes