Added search to base, fixed search page