* Extend base template tracking to also track attr templates

* Remove duplicated supported_features checks
* Don't show extra attributes with no results

Rebase to [email protected]