Index reworked. Search reworking started