Reverse some of the "Minor Refactor" to fix the All & Completed lists