Updated to return nil from search upon not finding