Added the remaining filters