Search with no results now returns Empty instead of NotFound
Added shutdown