Correctly filter by project