Fixes to care2x query