Merge pull request #196 from mhotan/master

Another attempt to fix Restaurant Find bugs