removed default qtype, fixed(?) branch check