Updating template tags to honor model settings