quick add and fixed entity pollution with lists