Added indexes for most searches