More work on server side to return highest scoring matches