New post Eli + tag fixes