Improved MageTab parsing