Updated criteria element filtering to include characteristics not already on the form