1. Bug fix.
2. Improve query.