fixes of missed templates and wrong context variable names
query added to form field