fixed pagination (after search was hit paging always starts with 1)
- updated collection.xconf to support searching of AgentSet => Name and Subjects => Term
Merge remote-tracking branch 'wolf/master' into master-wolf