Switch from maybe_drop/create to maybe_repair
First pass at filter repairs