Map fix for empty result set