Fix/respond with json