[FIX] Match units or unidades in query

Merged Santiago Said requested to merge MR into 8.0-stage

Merge request reports