Make sure we pass the context key when reloading a resource after changi...

...ng its template, as well as a fix for the desired action