Add proper handling of disabled state
Merge pull request #18 from natgeo/ls/MIE-1205

Add proper handling of disabled state