Remove filter so I can customize layout logic