KFSUPGRADE-886: entries fix