new fixes and sort by location