BLK-166 BLK-167 BLK-168 fixes typo and updates bool logic for empty lists