Refactored API so we can query by Commune