Reduce queries -- suggested changes