Fixes some value conversions and updates the entity search to be more accurate