edited query requestor, still needs work