Changing "||" to "OR" for PostgreSQL compatibility