[T-1419] Conditionally filter by selector & fix error on line without employee

Merged Facundo Barral requested to merge T-1419 into 12.0-stage

Merge request reports