Fixes #2216 Templates Requiring Additional Calls will always show