CRM-13170, fixes for contribution search to respect batch criteria