- refactored cq-parsing