improvements statistics

use indexes