Re-enable subtype and id in search-1.3.x