Refactor, add backup and restore functions, fix bug in existing probe filtering