Add Paul & Picard to companies
Remove some field from the 'empty' check