Condense qualifiers and fixed WHERE/QUALIFY queries