load estate window edits
Merge branch 'pooria'
search-result edit