More changes to support non case sensitive entries.