Fixed more issues with negative lookahead and order choice