Tweaked match search