show machine metadata in machine autocomplete
Merge branch 'enhancements'