DB queries improved