Fixed the wildcard query issue that was slowing the requests down
Fixes related to the move to multi-value everywhere