More straightforward SQL

Should not break