Fixing more literals to sync front-end with backend
Merge branch 'bw'