removed ux-query dependency