Fix comments query mapping (failed unit test)