Searching for companies works, changing a company works, but needs some review