Fixing bugs where filter values weren't applied correctly
Other small tweaks