APD-640: When performing new search set offset to "0"
Merge branch 'APD-640-BOZ' into develop