#1321690-1: Add numeric filter support