Fix label logic for admin list law. Completes #504 and closes #472