Add some indexes; tiny search improving