Much better search indexing and querying