Fix for proper filtering using 0 value