Adding wrap handling in selection.