Changes on some of the functions

Changes on add component and filter