Improve anonymous API key behaviour