Improve search; create table indices