Better matching for names with -s