Removing focus handlers, testing if this happens organically.
Updates to active query to group by company name.