Changing search to track by index. Adjusting header padding.