Add pg support for Heroku deployment
Add handler for empty index list situation