Refixed how we handle numbers in editting/adding/filtering