Make queries on questions page more efficient