fixing mapping and sorting
fixing issues