Fixing bugs, search v0.9