big improvements to definition request parsing and result relevancy