Added missing protections and label search