Wrote out filter for 60M
Reorganised filter table
Added code for extended filters
Merge branch 'hq'