query form added
optional custom mappings in the form