1.  For creation of new token, an empty locMap is no longer a fatal exception as the logic within ne token handles this use case  2.  Properly set the locMap in the retrievers