Add coordinates lookup
Remove unique row names fix