changes to selection search and wrapper offset