Remove commenting out
Add active collection ids to users
Adapted search code from collections controller
Delete query model and associated specs