Improve support for -Ssearch in the main view
Restore the die_callback so die messages are displayed properly