only show zone menu option if there are zones to search
Merge branch 'enhancements'