Can you make it so hauntlet can be ran for energy? It is also inconsistent there(The Remapping Change), sometimes I kill the boss and I can quick map with the 'Turn In' Quest while other times I remap to the same map(Going to House in between.).

Finishing the second room in the Hauntlet should justify a new instance(That is over half the map done.) .