Added components search within components