Search improvements
Text fix