Shortcode editor: fixes for sort list, properties near an address
Merge branch 'staging' into saved-search