fixed atom search speed by defering it to last