PRD-4520 Allow Edit of Query by name or select first Query if none are selected during edit