Fixed the component list for filtering use. It had some bugs but they should be gone now!