Fixed bug: filtering not working