AI-843 : fixed regressions in site form instance persistence and fetching