More complete new query screen