Get search improvements working with wrapper header