Minor context changes
Fix label search