Fix a couple of things

Would this match against a person named "York" who lives in "Bob's mill"?