Corrected a few indexes + extended search method