Adding changes for empty result sets.