Fixed slight bug that cause non filter components to have a switch
Made slight change to help with memory management of the component switches