Add missing picks message.
Optimize some queries.