modified some small changes to prevent null names in database