Readd project filter but make it optional