Extend the place name matcher to match more places

Not only find places in the form "Place, Admin1, Country" but also
"Place" and "Place, , Country".