Proper MQ parsing (without `only`). Fixes #1457