Fix filters for main layout
Conflict fix