Fixing issue with filtering, when using whole words vs exact matching