Fixed DataService, allow exchange update with where select