Fixed dumb code that wasn't checking for matches
Insert quick hack to hide initial matching