q_category and endpoint should be language independent (re #326)