eav bundle formvalue fixes