Small fixes related to search