Change local content search, refactoring