removed uid requirement to fix filter function