Fixed random stuff

Changed a lot of the random queries to work exactly as the email Roxana
sent wants them to