Properly fixed issue of records not saving (and duplicate numbers).
Let's make the filter a bit safer