SONARPLUGINS-3270 Improve association wizard