Fixed validation, added beam search validation