Added support for the new machine image searching