Fixed empty result case