Added armor discipline filter, changed joins to inner