Address TODOs and document QueryMethod