Added indexes to db columns