fix search page, etc