Merge pull request #554 from dantleech/improve_qb_validation

Fixed validation