fixing the query answer mechanism to include full answers. Changing
private functions to public ones towards structural refactoring