Search should be much faster than before :)