Search fix and errors, and other random things