Filter id format is not consistent between bidimensional grid macro and other macros

The bidimensional grid chart macro required a filterId to be specified for working, and it requires it to use the following format filter-XXXXX where XXXX is the filter number.

On the contrary, other charts macro such as piechart or created vs resolved chart macros, requires to use only the number without the filter- prefix.
It makes the usage of the filterId criteria much more complex for user.