Some fixes and removed the not working search script.