Filter by architecture too