Terms and ids filter

Resolved merge issues for terms and ids filters.