Refactored the achievement schema, un-nesting definitions and bringing the query operator into force.
Flattened the queries the NewAchievementModal creates.