DRY as much as possible
Merge branch 'DRY' into dev
DRY non-expr handling for basic search & stay