Refixed how we handle numbers in editting/adding/filtering
Merge pull request #244 from gterrono/handle-numbers-properly

Refixed how we handle numbers in editting/adding/filtering