update full search and refac