Optimized query
Merge pull request #1 from norkunas/patch-1

Optimized query