F92 - additional refactoring of markers