Fixed empty result sets