Added search control & functionality