add back location field
Drop to single API endpoint