More work on bug #7516.  I needed to add in all the information from the tables to that which came from the database.