Fixed a filtering issue