This commit the changes for better filtering