Fix to handling for form filter query
Updated Alpaca
Improvements to forms
Merge branch '1.0.6-RELEASE'