Fix for entity query matchvalue