- Fixing error on populate
- Fixing multi query using PK or index and switching to scan