Fix poll_storage

- Separate enrich and save processes