Search Feature fixes