Merge pull request #1385 from dennishendriksen/master

Fix #1383 X-ref filter drop down does not highlight your selection and fix dialog size on low resolution
Fix #1370 Filter wizard prev/next buttons not working when reopening