Components list service fix