Fix match list UI issue
Merge branch 'master' into wdjADS