Search related issues, fixed.