Fixed issue looking up name with apostrophe