front end changes to handle None from the datastore