Update to 1.0 and fixed searching