merged command-line & search changes