adjust form query for modules