RAZ-2411: Oracle: Issue with first time setup
Fixes for Oracle query syntax issues