Finished with zip delivering. Fixed filters logic.