search, hot fixes