fix adding wsu prefix of body id in sopa message + refactoring