Issue #3019 - handle google maps short link