couple more slight query improvements