VID-1920 fixing white space and cached jQuery selector