fix progressbar & remove confusing div + table structure
rename filter -> match