Add shipping fields to search Closes #3603