Use private names for public macros.
Allow multiple requests per query.