NORJIRA: improved query for botgarden datasource