Fixed View bug where empty Company or User does not appear