Limit fields and store for highlighting