more label fixes
workaround to wait for index to finish