Add x axis filter.
Drop x axis selection restriction.
Fix filtering (does match anything for 2 level filters).