#59 - Adjusts on questions and db querys