Refactor marker for using markers only with labels and no value #15