added indexes to db for stability and performance