Does It Fit calculation for Select/Checkbox/Radio is inconsistent with old behaviour

Setting up multiple contexts for a custom field like so:

• Project ctx with options [one, two]
• Issue Type ctx with options [one, three]

There are issues with running queries such as:

• project = SEVEN AND field = one
• type = Bug AND field = one

These should fit because the explicit context will force one particular set of options to be in play and not the other (ie it is not ambiguous).

There are more complex queries which should also fit - these are listed in the func test that has already been written but not yet committed.