Somehow these changes were lost while pulling the previous commit from the property-search-ui-v2 branch.