better empty expressions handling, NotNull & GPUB update