add checks for partial matches in enable/disable