Fix errors after merge
Fix errors in search