Updated advanced queries