Yup, the new format (idea) would have a drop down right next to the search button where you would be able to select maps or images (just not in that prototype).

Yup, the new format (idea) would have a drop down right next to the search button where you would be able to select maps or images (just not in that prototype). You could still of course also precede or end your search with !m or !i for maps or images. What do you think?