- Fixing add feed modal
- Rewriting a few orm queries to sql