JBIDE-17300 - small changes for better user performance