#385 Readd query-validation and jsDefaults