CRM-12925, 12924 - fixes related to searches on pseudoconstants.