DEVELOPER-324 - Put all filter items on singular

It seems that it didn't affect the javascript filter.