Added indexes on table
Added search query scope