Fix regression due to the system_tags introduction