Make keyFilter mechanism work again
Accidentally got broken with 69fa5635 as it always returned the value based on the string filter