Fix to handling for form filter query
Updated Alpaca
Improvements to forms