more work on current research page
Merge remote-tracking branch 'origin/master'
update filters following Dave's js changes
Merge remote-tracking branch 'origin/master'