Updated to allow filtering on A.or:M and M.or.P
Updated to allow filtering on A.or:M and M.or.P

chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster,chipster/chipster