Fix for empty volume list
Smarter spotlight option