Added several indices and several optimised query`s