Prefetch normal fields, and fix filter to search in DB not filter after