more fixes to get keys instead of serial field