Made style and ordering of rules on analyze match collect
ensure analyze data is parsed before added to a collection
Merge branch 'master' into staging