*8594* Improve listbuilder behavior (needs more work)