[WIP] Make requested fields unique