Included the working fix for template tag Deprecation warning.