Added search functionality. Some micro tuneings