fixed component search
code cleanup