AppSharing/casa-engine#27 - Add query form and refactor controller layout