Search:faster and nicer working search in 2 steps