Improving Survey and SurveyCollections config (WIP, test needed)