Fixes 10755: Don't remove quotes around q element by default

BS3 commits: 000b445a042cc97d21d743ef917a35c23dde2a3e
Avoid LESS nesting if isn't needed

BS3 commits: 5b12736fb79d826f231032b3e927057cec28bc34