removing key when pass change is done and fixing templates