Fixed a few issues in autolist generation logic