Fix before filter
Add specs
Fix before filter for preview
Use concern instead of base class