Fix Collection handling for Oracle queries