Fixed ROWNUM issue - now compatible with Oracle and Postgres