fixed search keys issue