Be more aggressive and defensive in select also