[sailfish][Refactoring] Inlined ComboBoxList; reorganized AddSubscription
[sailfish][Refactoring] Extracted function