add 'active' scope to EditLock and 'editing' scope to Entry