FLUID-5484: Fixing row markers better