Split the marker regexp into multiple rexeps for generic and field specific ones

[canova]

cc @fqueze

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 88.46%. Comparing base (0c833a8) to head (8533b3a).

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4971   +/-   ##
=======================================
  Coverage   88.45%   88.46%           
=======================================
  Files         304      304           
  Lines       27311    27332   +21     
  Branches     7374     7380    +6     
=======================================
+ Hits        24158    24179   +21     
  Misses       2931     2931           
  Partials      222      222           

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[canova]

This has been landed as a part of #4981, closing.