Added Search based searching