Had to re-introduce a view ID, improved layout of the query forms