Fixed Jeff's Check-Availability issue, more index changes