make the query more generic
:bug: i'm basically an idiot :finnadie: