Macro regex should be more strict

[andresmgot]

I attempted to add a new macro timeFilterEpoc while there is already a macro timeFilter. The problem is that the regex here is always matching timeFilter in all cases.