progress with and/or combinations
all existing tests ok
correction in union/join combination all working