Reports & filters completed
Merge branch 'fixing'