Removed some phpstorm marks, updated json controller.