#151: Added 'selected' suffix