Changed the get_query_set syntax and attempt to fix some ISO metadata structure errors that fail validation
Merge branch 'metadata_template_enhancement_code' into metadata_template_enhancement