Change template order selection.
Update CHANGES.rst file with last change.