Adding indexes, slightly changing random question selecting queries