Refactoring of fixSuspicious queue