Fields are now validated including concept data
Simplified code to pass query around instead of component parts