Reduce verbosity of constraint violations
Fix check for manual selects