DEVELOPER-324 - Put all filter items on singular