improved check for highlight fields + moved luke functions to separate file