recompose field selectors to avoid duplicates

before: :(location:(name),location:(country:(code)))
after: : (location:(name,country:(code)))