Def Query Attempt

Last Definition Query Attempt to workaround the Pop Definition Query Bug