drag and drop related improvements on QA2