Do not store all stanzas + other fixes

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>