Change the initial size of the THashSet to 2 instead of 17;  this
reduces the size of larger maps
Direct imports result not updated correctly after manual load #277

Unit test provided by Phil Lord and fix for the bug.