Filter bar changes and add beginning of filtering
Fix JS error