Fixes maximum and minimum aggregation forms

https://www.pivotaltracker.com/story/show/79518530