Prevent empty data criteria fields from being added

Fixes https://www.pivotaltracker.com/story/show/63026128