Improvements for GeoPlatformSearchWindow