Add extra data to json responses
Add extra data to json responses

Also ensures some data is only retrieved when the operation is
successful.

carlosperate/LightUpPi-Alarm,carlosperate/LightUpPi-Alarm,carlosperate/LightUpPi-Alarm,carlosperate/LightUpPi-Alarm