Made searchselect fields required and changed query template parameter name
Proper merging of snippet parameters