updated list service and fixed optimizations