Improve xyplot to work with mixed rasters (categorical and numeric)