search in more places, refactor