Re-work show label/tooltip checks