Fixed #38. Rewritten SQL to include full company name.

Fixed #38. Rewritten SQL to include full company name.