minor changes on search structure