fixes for mappings and IDs