Fixed empty-result set items