Show delete-criteria button when multiple fields are present

Fix tests accordingly.