Updated 1.0, fixed search functionality