Better list condition handling
Added "guest" support