Combining different folders with similar starting names

Indeed this was unexpected and undesired. It is now fixed at 4503bb4
Please update your Brainstorm instance