Fix #2 Formatting names consumes too much queries.