DB indexing fixes and name normalization.