refined full query