move entity mapping into Tab