Hide {{control}} behind a flag - Fixes #2073