Merge pull request #1615 from dennishendriksen/master

Fix #1614 Study manager state change through manage tab broken
Fix #1508 #1574 #1607 #1608 Use non-analyzed field for aggregation