fix tags reference and wait longer before getting tags