Add search features back