Change to auto generated front page blocks
Auto Filter generation
Fix Filtering