close #16 . close #26 . Also fixed FIP search so soft_deleted FIPs don't get searched anymore