Tasks completeness improvements