Fix for public machine image search.