Improvements on wizard code
MERGE with MASTER
Improvements for GeoPlatformSearchWindow