Index fix plus hopefully search