Fix comment query. Service comments only right now