fixes #2482

fixes  #2482

reduces queries massively if in draft mode. From 78 to 35 with 4 plugins....