Refactor handling of markers => filtering ok