Reverted filter changes, made filterValue method