More work on install stack
Fix query and text