Merge "Search from db components change"