remove functional field in wombat.data.type, move the primary search to handler