Prevent display_as and display_name from being used when blank
Bunch of small fixes for Laura