Made subject filtering js-based