changed surveyId and queryId to Strings
build zeug und tests angepasst