DB optimization (idexes)

indexes added