Fixed search bug, better display of match info