Swap API responses and fixed getall method