Bug #1962: Extended template table now is more careful with context

Removed commented code