1019657 modified text and pup up events so they don't collapse when there is no text