More Seach functionality completed