Enhance google's preset and our own by proxy. Fixes #506