Added _link and _embed to Query parsing, specs