Added better contact look up support (will go through all of the results to check for a match in the contacts list) as opposed to just taking the first result