Moved isVisible & isEnabled from lookup to handler. Fixes #504