GIS now working with refactored expressions