Refactored component search