rosie.suite_id: improve logic