Added 'and lastname' to label for name to some more places