TABDEV-3796: modified search options to allow resetting origin
Merge branch 'feature/TABDEV-3796' into develop