better build checks for auto-select actions

http://manage.dimagi.com/default.asp?129095