Bug #4761 Fix some bugs at database schema and data file