Improve gG websearch mapping
Merge