QueryBuilder now works with no tags set