Update XQuery to not destroy submits and display only when enabled.
Update simple search too.
Update to not pop warnings when the default is there.
Merge pull request #10 from jordandukart/7.x-METRO-88

Update XQuery to not destroy submits and display only when enabled.