Revert to tabs
Ensure captured map is never null by lazy initialisation