made help queries more robust