Completion for field/section names improved