removing search and fix some staff