* Added more slightly complicated query - make_qyery function doesn't
seem to work