Make drawings index query more efficient