fixed search feature. Now it is complete