Bug fix and moved localization into Generic Data Table.