Livesearch fixes