some fixes
updated return names for queries