extend initial search params to include zone, type, and machine... allow multiple values in search
Merge branch 'enhancements'