Changed query for simple mode so that repetition is reduced