fixed nano handling for saved queries; layout improvements