Filter out collection and person in "More Work Types"

This pull request fixs both HYDRASIR-272 and HYDRASIR-319

Reverting changes by HYDRASIR-272 since it resulted in bug when trying to view by work type.
Added method to blacklight solr_search_params_logic which is  applied only during work_type file. This solution works better since it remove collection and person only from work filter and available for querying if needed in other places