fixes #2992 and #2991
typo
reversed logic
increased queires because of second static placeholder
fixed templates
fixed tests
fixing tests
Merge pull request #2993 from digi604/fix-2992

fixes #2992 and #2991