Ajay/Pooja | #2924 | Use non-analyzed field for submission faceting