fix order of expander / re-expander topics
switch swap id for group attribute for file-based resources