improved fetch join mappings