Fixed return values to always JSON