added more smart supoort of :deferred value to Context.set method
small bugfix in model