WCMS-248 Fixed the helper and added filters