minor fixes for making outer use of surveillance possible
fix duplicate nested models creation when updating a model, related to Decent Exposure