add search and question wrappers