Fix wrong place to reset content & url