Pass default mapping to query expressions. Fix for #3114