Updated to use more aggressive name searching