Optimized turning on/off.

Loaded the list for every request which was not needed.