Revised search for companies, less code, more understandable