Somehow the controller query portion got missed on the last commit.  This adds it back in